Work around deprecation of SoupServer's port property

See https://bugzilla.gnome.org/show_bug.cgi?id=732184

diff --git a/Makefile.am b/Makefile.am
index 614413ca483bfd6a5dfb3ffb6879532888fa5331..34381ec30935cae9e441cd4712d33fc63eb2327a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,7 @@ AM_CPPFLAGS += -DDATADIR='"$(datadir)"' -DLIBEXECDIR='"$(libexecdir)"' \
        -DGPGVPATH=\"$(GPGVPATH)\" \
        -DOSTREE_FEATURES='"$(OSTREE_FEATURES)"' \
        -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_36 \
-       -DSOUP_VERSION_MIN_REQUIRED=SOUP_VERSION_2_40 -DSOUP_VERSION_MAX_ALLOWED=SOUP_VERSION_40
+       -DSOUP_VERSION_MIN_REQUIRED=SOUP_VERSION_2_40 -DSOUP_VERSION_MAX_ALLOWED=SOUP_VERSION_2_48
 AM_CFLAGS += $(WARN_CFLAGS)
 DISTCHECK_CONFIGURE_FLAGS += --enable-gtk-doc --disable-maintainer-mode
 

diff --git a/src/ostree/ot-builtin-trivial-httpd.c b/src/ostree/ot-builtin-trivial-httpd.c
index 4cfc4b4773cb9de15f8be75f78cdccbae84cb254..727ff30fdb60cf150574cc076041b38ec9efa834 100644 (file)
--- a/src/ostree/ot-builtin-trivial-httpd.c
+++ b/src/ostree/ot-builtin-trivial-httpd.c
@@ -345,9 +345,15 @@ ostree_builtin_trivial_httpd (int argc, char **argv, OstreeRepo *repo, GCancella
 
   app->root = g_file_new_for_path (dirpath);
 
+#if SOUP_CHECK_VERSION(2, 48, 0)
+  server = soup_server_new (SOUP_SERVER_SERVER_HEADER, "ostree-httpd ", NULL);
+  soup_server_listen (server, NULL, 0);
+#else
   server = soup_server_new (SOUP_SERVER_PORT, 0,
                             SOUP_SERVER_SERVER_HEADER, "ostree-httpd ",
                             NULL);
+#endif
+
   soup_server_add_handler (server, NULL, httpd_callback, app, NULL);
   if (opt_port_file)
     {